broadway: Actually upload textures to client

diff --git a/gdk/broadway/broadway-output.c b/gdk/broadway/broadway-output.c
index 4434447e0f99aae871c64dbc94dc3da41610c029..b9a86daf61f6ad83841d128c425353bfd09ce089 100644 (file)
--- a/gdk/broadway/broadway-output.c
+++ b/gdk/broadway/broadway-output.c
@@ -330,3 +330,23 @@ broadway_output_put_buffer (BroadwayOutput *output,
   g_object_unref (out);
   g_object_unref (out_mem);
 }
+
+void
+broadway_output_upload_texture (BroadwayOutput *output,
+                               guint32 id,
+                               GBytes *texture)
+{
+  gsize len = g_bytes_get_size (texture);
+  write_header (output, BROADWAY_OP_UPLOAD_TEXTURE);
+  append_uint32 (output, id);
+  append_uint32 (output, (guint32)len);
+  g_string_append_len (output->buf, g_bytes_get_data (texture, NULL), len);
+}
+
+void
+broadway_output_release_texture (BroadwayOutput *output,
+                                guint32 id)
+{
+  write_header (output, BROADWAY_OP_RELEASE_TEXTURE);
+  append_uint32 (output, id);
+}

diff --git a/gdk/broadway/broadway-output.h b/gdk/broadway/broadway-output.h
index 0ccda2484d685f69c7a0ea4eeb48d5207e3315bf..784ae179dbfbaee72c6a0fdb9f6dd2b084a54bc2 100644 (file)
--- a/gdk/broadway/broadway-output.h
+++ b/gdk/broadway/broadway-output.h
@@ -58,6 +58,11 @@ void            broadway_output_put_buffer      (BroadwayOutput *output,
                                                 int             id,
                                                  BroadwayBuffer *prev_buffer,
                                                  BroadwayBuffer *buffer);
+void            broadway_output_upload_texture (BroadwayOutput *output,
+                                               guint32 id,
+                                               GBytes *texture);
+void            broadway_output_release_texture (BroadwayOutput *output,
+                                                guint32 id);
 void            broadway_output_grab_pointer    (BroadwayOutput *output,
                                                 int id,
                                                 gboolean owner_event);

diff --git a/gdk/broadway/broadway-protocol.h b/gdk/broadway/broadway-protocol.h
index 58e64347b0910aab5030e62ecdb679d7b6e92512..2fa93d4182fbf2c9581f00be394abee2b176c4b4 100644 (file)
--- a/gdk/broadway/broadway-protocol.h
+++ b/gdk/broadway/broadway-protocol.h
@@ -43,6 +43,8 @@ typedef enum {
   BROADWAY_OP_DISCONNECTED = 'D',
   BROADWAY_OP_PUT_BUFFER = 'b',
   BROADWAY_OP_SET_SHOW_KEYBOARD = 'k',
+  BROADWAY_OP_UPLOAD_TEXTURE = 't',
+  BROADWAY_OP_RELEASE_TEXTURE = 'T',
 } BroadwayOpType;
 
 typedef struct {

diff --git a/gdk/broadway/broadway-server.c b/gdk/broadway/broadway-server.c
index d7e55165011b0463ced5fdb6013f3b2b27e7e87a..6d5dde86fe57440ad64217b4c115021006e88acd 100644 (file)
--- a/gdk/broadway/broadway-server.c
+++ b/gdk/broadway/broadway-server.c
@@ -1647,6 +1647,9 @@ broadway_server_upload_texture (BroadwayServer   *server,
                        GINT_TO_POINTER (id),
                        g_bytes_ref (texture));
 
+  if (server->output)
+    broadway_output_upload_texture (server->output, id, texture);
+
   return id;
 }
 
@@ -1655,6 +1658,9 @@ broadway_server_release_texture (BroadwayServer   *server,
                                 guint32           id)
 {
   g_hash_table_remove (server->textures, GINT_TO_POINTER (id));
+
+  if (server->output)
+    broadway_output_release_texture (server->output, id);
 }
 
 gboolean
@@ -1901,12 +1907,21 @@ broadway_server_new_window (BroadwayServer *server,
 static void
 broadway_server_resync_windows (BroadwayServer *server)
 {
+  GHashTableIter iter;
+  gpointer key, value;
   GList *l;
 
   if (server->output == NULL)
     return;
 
-  /* First create all windows */
+  /* First upload all textures */
+  g_hash_table_iter_init (&iter, server->textures);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    broadway_output_upload_texture (server->output,
+                                   GPOINTER_TO_INT (key),
+                                   (GBytes *)value);
+
+  /* Then create all windows */
   for (l = server->toplevels; l != NULL; l = l->next)
     {
       BroadwayWindow *window = l->data;

diff --git a/gdk/broadway/broadway.js b/gdk/broadway/broadway.js
index b134d85faadc7afa18905497f9c74785ec0ee437..12578d78ae4faa44cb54d01427d5dc9d60edc72c 100644 (file)
--- a/gdk/broadway/broadway.js
+++ b/gdk/broadway/broadway.js
@@ -99,6 +99,7 @@ var lastTimeStamp = 0;
 var realWindowWithMouse = 0;
 var windowWithMouse = 0;
 var surfaces = {};
+var textures = {};
 var stackingOrder = [];
 var outstandingCommands = new Array();
 var inputSocket = null;
@@ -528,6 +529,20 @@ function cmdPutBuffer(id, w, h, compressed)
     surface.imageData = imageData;
 }
 
+function cmdUploadTexture(id, data)
+{
+    var blob = new Blob([data],{type: "image/png"});
+    var url = window.URL.createObjectURL(blob);
+    textures[id] = url;
+}
+
+function cmdReleaseTexture(id)
+{
+    var url = textures[id];
+    window.URL.revokeObjectURL(url);
+    delete textures[id];
+}
+
 function cmdGrabPointer(id, ownerEvents)
 {
     doGrab(id, ownerEvents, false);
@@ -624,6 +639,17 @@ function handleCommands(cmd)
             cmdPutBuffer(id, w, h, data);
             break;
 
+       case 't': // Upload texture
+           id = cmd.get_32();
+            var data = cmd.get_data();
+            cmdUploadTexture(id, data);
+            break;
+
+       case 'T': // Upload texture
+           id = cmd.get_32();
+            cmdReleaseTexture(id);
+            break;
+
        case 'g': // Grab
            id = cmd.get_16();
            var ownerEvents = cmd.get_bool ();